Commit a forgotten fix.

diff --git a/ChangeLog b/ChangeLog
index 39fba44898583798d91c06f56ad9c15512012292..018a02d18d643ac0b661773826c89acd2dd8619e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
+       which was mentioned below.
+
 Thu Jun 24 23:35:09 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_class_init): Fix a typo,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39fba44898583798d91c06f56ad9c15512012292..018a02d18d643ac0b661773826c89acd2dd8619e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
+       which was mentioned below.
+
 Thu Jun 24 23:35:09 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_class_init): Fix a typo,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 39fba44898583798d91c06f56ad9c15512012292..018a02d18d643ac0b661773826c89acd2dd8619e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
+       which was mentioned below.
+
 Thu Jun 24 23:35:09 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_class_init): Fix a typo,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 39fba44898583798d91c06f56ad9c15512012292..018a02d18d643ac0b661773826c89acd2dd8619e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jun 25 00:32:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
+       which was mentioned below.
+
 Thu Jun 24 23:35:09 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_class_init): Fix a typo,

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 6f7bf8c84a2eef87fe585dc50796b3a74515a25f..8d18427394bdb58cd76e31b5b504c708d3243e9c 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -2014,18 +2014,33 @@ gtk_tree_store_swap (GtkTreeStore *tree_store,
   gtk_tree_path_up (path_a);
   gtk_tree_path_up (path_b);
 
-  if (gtk_tree_path_compare (path_a, path_b))
+  if (gtk_tree_path_get_depth (path_a) == 0
+      || gtk_tree_path_get_depth (path_b) == 0)
     {
-      gtk_tree_path_free (path_a);
-      gtk_tree_path_free (path_b);
-
-      g_warning ("Given childs are not in the same level\n");
-      return;
+      if (gtk_tree_path_get_depth (path_a) != gtk_tree_path_get_depth (path_b))
+        {
+          gtk_tree_path_free (path_a);
+          gtk_tree_path_free (path_b);
+                                                                                
+          g_warning ("Given children are not in the same level\n");
+          return;
+        }
+      parent_node = G_NODE (tree_store->root);
+    }
+  else
+    {
+      if (gtk_tree_path_compare (path_a, path_b))
+        {
+          gtk_tree_path_free (path_a);
+          gtk_tree_path_free (path_b);
+                                                                                
+          g_warning ("Given children don't have a common parent\n");
+          return;
+        }
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent,
+                               path_a);
+      parent_node = G_NODE (parent.user_data);
     }
-
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path_a);
-  parent_node = G_NODE (parent.user_data);
-
   gtk_tree_path_free (path_b);
 
   /* old links which we have to keep around */